Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 07:06:04 +0000 (00:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 07:06:04 +0000 (00:06 -0700)
commit2bec399e7d4ad048f62f4acd5eef9e86a3c0645e
treeb9f9575a1a0f2709612ece2f103be4c49638563d
parentd5b58abb3fdb249d0320c1954b774ec617d8ab28
parent208c59c267a077789a4dca1feb2df77b0edcb95b
Merge from trunk.
ChangeLog
configure.in
src/ChangeLog
src/callint.c
src/emacs.c
src/sysdep.c
src/xdisp.c